When translating N_() strings, use _(), not gettext(), since we really

Thu Jan 28 01:34:29 1999  Owen Taylor  <otaylor@redhat.com>

	* gtkfontsel.c gtkcolorsel.c: When translating
	N_() strings, use _(), not gettext(), since we
	really need to call dgettext().

diff --git a/ChangeLog b/ChangeLog
index fe61fdecb1fdad4f1a1a035f772bc9cf6d30a380..e0f1e110d628cd84f95e6ef2e8570077a0dfe740 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jan 28 01:34:29 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtkfontsel.c gtkcolorsel.c: When translating
+       N_() strings, use _(), not gettext(), since we
+       really need to call dgettext().
+
 Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4: Xsed isn't valid here, don't use it

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fe61fdecb1fdad4f1a1a035f772bc9cf6d30a380..e0f1e110d628cd84f95e6ef2e8570077a0dfe740 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Thu Jan 28 01:34:29 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtkfontsel.c gtkcolorsel.c: When translating
+       N_() strings, use _(), not gettext(), since we
+       really need to call dgettext().
+
 Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4: Xsed isn't valid here, don't use it

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fe61fdecb1fdad4f1a1a035f772bc9cf6d30a380..e0f1e110d628cd84f95e6ef2e8570077a0dfe740 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jan 28 01:34:29 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtkfontsel.c gtkcolorsel.c: When translating
+       N_() strings, use _(), not gettext(), since we
+       really need to call dgettext().
+
 Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4: Xsed isn't valid here, don't use it

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fe61fdecb1fdad4f1a1a035f772bc9cf6d30a380..e0f1e110d628cd84f95e6ef2e8570077a0dfe740 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Jan 28 01:34:29 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtkfontsel.c gtkcolorsel.c: When translating
+       N_() strings, use _(), not gettext(), since we
+       really need to call dgettext().
+
 Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4: Xsed isn't valid here, don't use it

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fe61fdecb1fdad4f1a1a035f772bc9cf6d30a380..e0f1e110d628cd84f95e6ef2e8570077a0dfe740 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Jan 28 01:34:29 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtkfontsel.c gtkcolorsel.c: When translating
+       N_() strings, use _(), not gettext(), since we
+       really need to call dgettext().
+
 Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4: Xsed isn't valid here, don't use it

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fe61fdecb1fdad4f1a1a035f772bc9cf6d30a380..e0f1e110d628cd84f95e6ef2e8570077a0dfe740 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Jan 28 01:34:29 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtkfontsel.c gtkcolorsel.c: When translating
+       N_() strings, use _(), not gettext(), since we
+       really need to call dgettext().
+
 Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4: Xsed isn't valid here, don't use it

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fe61fdecb1fdad4f1a1a035f772bc9cf6d30a380..e0f1e110d628cd84f95e6ef2e8570077a0dfe740 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jan 28 01:34:29 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtkfontsel.c gtkcolorsel.c: When translating
+       N_() strings, use _(), not gettext(), since we
+       really need to call dgettext().
+
 Wed Jan 27 20:51:25 PST 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4: Xsed isn't valid here, don't use it

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index a7240a66ee830097c8e2c736f78d6eeb13c76d84..0bb87f70bb97abc46f1d997f3663437127e3c9fa 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -389,7 +389,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
 
   for (n = HUE; n <= OPACITY; n++)
     {
-      label = gtk_label_new (gettext(scale_vals[n].label));
+      label = gtk_label_new (_(scale_vals[n].label));
       gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
       gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, n, n + 1);
 

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index e50b9490c313c80c7019918437e6dffd2bdb7bfb..bfd3b5ca9bd53427533474c2d0186a3fb8043409 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -731,7 +731,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
   row_text[2] = "";
   for (i = 0; i < GTK_XLFD_NUM_FIELDS; i++)
     {
-      row_text[0] = gettext(xlfd_field_names[i]);
+      row_text[0] = _(xlfd_field_names[i]);
       gtk_clist_append(GTK_CLIST(fontsel->info_clist), row_text);
       gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 0, 0, 4);
       gtk_clist_set_shift(GTK_CLIST(fontsel->info_clist), i, 1, 0, 4);
@@ -824,7 +824,7 @@ gtk_font_selection_init(GtkFontSelection *fontsel)
       gint left = filter_positions[prop][0];
       gint top = filter_positions[prop][1];
       
-      label = gtk_label_new(gettext(xlfd_field_names[xlfd_index[prop]]));
+      label = gtk_label_new(_(xlfd_field_names[xlfd_index[prop]]));
       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
       gtk_misc_set_padding (GTK_MISC (label), 0, 2);
       gtk_widget_show(label);